GtkColorChooser: make set_rgba work in editor mode
authorSebastien Lafargue <slafargue@gnome.org>
Fri, 22 Jan 2016 21:25:29 +0000 (22:25 +0100)
committerMatthias Clasen <mclasen@redhat.com>
Sat, 23 Jan 2016 23:16:51 +0000 (18:16 -0500)
When using the color chooser in editor mode,
gtk_color_chooser_set_rgba need to be propaged
to the editor

https://bugzilla.gnome.org/show_bug.cgi?id=761005

gtk/gtkcolorchooserwidget.c

index 85d6c2b059b6aaacf25cb1e545aad41f590bbc33..4986065d4d466fc81c53149c1d23c2c028101b84 100644 (file)
@@ -115,10 +115,14 @@ select_swatch (GtkColorChooserWidget *cc,
   gtk_widget_queue_draw (GTK_WIDGET (cc->priv->current));
 
   gtk_color_swatch_get_rgba (swatch, &color);
+
   g_settings_set (cc->priv->settings, "selected-color", "(bdddd)",
                   TRUE, color.red, color.green, color.blue, color.alpha);
 
-  g_object_notify (G_OBJECT (cc), "rgba");
+  if (gtk_widget_get_visible (GTK_WIDGET (cc->priv->editor)))
+    gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (cc->priv->editor), &color);
+  else
+    g_object_notify (G_OBJECT (cc), "rgba");
 }
 
 static void